Merge upstream tag v2.8.5. Test: None Bug: http://b/206146298 Change-Id: I55aacf3277a53dfe052b063818b9a18b9977ad32